From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 22 Jan 2025 20:28:29 +0000 (-0400)
Subject: fix reversion
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~6^2~183^2~43
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d3de3c28eb2582d1f12c20e4ff16825d18f3f0bc;p=git-annex.git

fix reversion

af3b9cbd3647ecfb3f3f6c4008dc9e64f7d42591 lost takeFileName, breaking the
test suite
---

diff --git a/Annex/ReplaceFile.hs b/Annex/ReplaceFile.hs
index 188b300b88..5cb46b17dd 100644
--- a/Annex/ReplaceFile.hs
+++ b/Annex/ReplaceFile.hs
@@ -57,7 +57,7 @@ replaceFile createdirectory file action = replaceFile' createdirectory file (con
 
 replaceFile' :: (RawFilePath -> Annex ()) -> RawFilePath -> (a -> Bool) -> (RawFilePath -> Annex a) -> Annex a
 replaceFile' createdirectory file checkres action = withOtherTmp $ \othertmpdir -> do
-	let basetmp = relatedTemplate' file
+	let basetmp = relatedTemplate' (P.takeFileName file)
 	withTmpDirIn (fromRawFilePath othertmpdir) (toOsPath basetmp) $ \tmpdir -> do
 		let tmpfile = toRawFilePath tmpdir P.</> basetmp
 		r <- action tmpfile